From 3f7ecb40273a079113a9a95a4e26d686215d7427 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 6 Jan 2016 15:13:31 -0800
Subject: [PATCH] WebRequest::appendQuery*() functions no longer take
 $onlyquery

Deprecated since 1.25, unused anywhere

Change-Id: I52224635cfeaf4748abeaa07b0c92e7f452fa93f
---
 includes/WebRequest.php            | 17 ++++-------------
 includes/diff/DifferenceEngine.php |  2 +-
 includes/skins/SkinTemplate.php    |  2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 7e22404c6a..7b76592348 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -729,33 +729,24 @@ class WebRequest {
 	/**
 	 * @param string $key
 	 * @param string $value
-	 * @param bool $onlyquery [deprecated]
 	 * @return string
 	 */
-	public function appendQueryValue( $key, $value, $onlyquery = true ) {
-		return $this->appendQueryArray( array( $key => $value ), $onlyquery );
+	public function appendQueryValue( $key, $value ) {
+		return $this->appendQueryArray( array( $key => $value ) );
 	}
 
 	/**
 	 * Appends or replaces value of query variables.
 	 *
 	 * @param array $array Array of values to replace/add to query
-	 * @param bool $onlyquery Whether to only return the query string
-	 *  and not the complete URL [deprecated]
 	 * @return string
 	 */
-	public function appendQueryArray( $array, $onlyquery = true ) {
-		global $wgTitle;
+	public function appendQueryArray( $array ) {
 		$newquery = $this->getQueryValues();
 		unset( $newquery['title'] );
 		$newquery = array_merge( $newquery, $array );
-		$query = wfArrayToCgi( $newquery );
-		if ( !$onlyquery ) {
-			wfDeprecated( __METHOD__, '1.25' );
-			return $wgTitle->getLocalURL( $query );
-		}
 
-		return $query;
+		return wfArrayToCgi( $newquery );
 	}
 
 	/**
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 5e376639ca..d588d51ca7 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -433,7 +433,7 @@ class DifferenceEngine extends ContextSource {
 					array( $msg ) );
 			} else {
 				# Give explanation and add a link to view the diff...
-				$query = $this->getRequest()->appendQueryValue( 'unhide', '1', true );
+				$query = $this->getRequest()->appendQueryValue( 'unhide', '1' );
 				$link = $this->getTitle()->getFullURL( $query );
 				$msg = $suppressed ? 'rev-suppressed-unhide-diff' : 'rev-deleted-unhide-diff';
 				$out->wrapWikiMsg(
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index c0e5556937..2ecbafb1bd 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1204,7 +1204,7 @@ class SkinTemplate extends Skin {
 			$nav_urls['print'] = array(
 				'text' => $this->msg( 'printableversion' )->text(),
 				'href' => $this->getTitle()->getLocalURL(
-					$request->appendQueryValue( 'printable', 'yes', true ) )
+					$request->appendQueryValue( 'printable', 'yes' ) )
 			);
 		}
 
-- 
2.20.1